Try to fix the continuous build
authorMatthias Clasen <mclasen@redhat.com>
Fri, 13 Jun 2014 18:16:37 +0000 (14:16 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 13 Jun 2014 18:16:37 +0000 (14:16 -0400)
Making gtk.gresource.xml generated was causing a problem for
srcdir!=builddir builds from git. Builds from tarballs are
not affected, because the tarball contains the generated file.

gtk/Makefile.am

index df0460c609cf57722920e581a3b3026fadfbe630..b68f5f323785441bbb39ba9a3e9218ed413d5565 100644 (file)
@@ -1418,13 +1418,13 @@ adwaita_sources = \
        resources/theme/Adwaita/assets.txt \
        resources/theme/Adwaita/borders.txt
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(builddir)/gtk.gresource.xml)
 
 gtkresources.h: gtk.gresource.xml
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
                --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
 gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
                --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-source --manual-register
 
 gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h